tests: Loosen error regexp

libcurl AFAICS doesn't have an API to convert HTTP code :arrow_right: error
string, so let's make the test regexp operate on both.

Closes: #651
Approved by: giuseppe

diff --git a/tests/test-pull-repeated.sh b/tests/test-pull-repeated.sh
index 5a3af81c1e3ffbf867ad77fbf29ecd0c1afd71be..8934e4302eb46eb088881adb5b0cc69e1f74cffe 100755 (executable)
--- a/tests/test-pull-repeated.sh
+++ b/tests/test-pull-repeated.sh
@@ -34,7 +34,7 @@ for x in $(seq 200); do
        echo "Success on iteration ${x}"
        break;
     fi
-    assert_file_has_content err.txt "500.*Internal Server Error"
+    assert_file_has_content err.txt "\(500.*Internal Server Error\)\|\(HTTP 500\)"
 done
 
 ${CMD_PREFIX} ostree --repo=repo fsck

diff --git a/tests/test-pull-resume.sh b/tests/test-pull-resume.sh
index 1e7220d09c74fc74f6cf0b9430ca15f11078fa42..06cd0793462a76ece071aa8f8aead29a39cfa18c 100755 (executable)
--- a/tests/test-pull-resume.sh
+++ b/tests/test-pull-resume.sh
@@ -42,7 +42,7 @@ do
   if ${CMD_PREFIX} ostree --repo=repo pull origin main 2>err.log; then
     break
   fi
-  assert_file_has_content err.log 'error:.*Download incomplete'
+  assert_file_has_content err.log 'error:.*\(Download incomplete\)\|\(Transferred a partial file\)'
 done
 if ${CMD_PREFIX} ostree --repo=repo fsck; then
     echo "ok, pull succeeded!"